From 972c0fa99831b731fc9544e024c86a77b60857b5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Tue, 30 Jan 2018 10:18:54 +0100
Subject: [PATCH] Revert "menu: Simplify popup_at_rect"

This reverts commit a29306cb1e739afaa4a7b31d48c4bec328cfef9e.
---
 gtk/gtkmenu.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index a28e92bce9..ffcaafddd2 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1924,6 +1924,7 @@ gtk_menu_popup_at_rect (GtkMenu            *menu,
                         const GdkEvent     *trigger_event)
 {
   GtkMenuPrivate *priv;
+  GdkEvent *current_event = NULL;
   GdkDevice *device = NULL;
   guint button = 0;
   guint32 activate_time = GDK_CURRENT_TIME;
@@ -1941,7 +1942,8 @@ gtk_menu_popup_at_rect (GtkMenu            *menu,
 
   if (!trigger_event)
     {
-      trigger_event = gtk_get_current_event ();
+      current_event = gtk_get_current_event ();
+      trigger_event = current_event;
     }
 
   if (trigger_event)
@@ -1962,6 +1964,8 @@ gtk_menu_popup_at_rect (GtkMenu            *menu,
                            NULL,
                            button,
                            activate_time);
+
+  g_clear_object (&current_event);
 }
 
 /**
-- 
2.30.2